Mike's code review#2

mernst wants to merge 3 commits intomainbenwu25/c-rosae:mainfrom

code-reviewbenwu25/c-rosae:code-reviewCopy head branch name to clipboard