Cleanup old functions. Add some comments
Fixes to temp class
Merge branch 'master' of https://github.com/mmeyer2k/noodle