cleaned up the folder. made some additional small fixes.
Merge branch 'master' of github.com:kamaitama/Tiramisu