Fixed TODOs in code
Fixing more build errors.
Merge pull request #13 from rosemwahlin/master

Fixed build, added command line options