stuff
stuff
stuff
Lots of small fixes and improvements
Merge pull request #20 from math1man/master

Testing is functional