Add missing {}
vexing parse...
Remove unnecessary template<>
Add needed std::
Remove mismatched struct / class
Merge pull request #219 from cmaloney/misc-fixes

Misc fixes