Move all <ctrl> based commands into conditional.
Use .= for string concatination
Merge pull request #58 from lgauthie/master

A few fixes