Merge pull request #48 from SmilyOrg/development

Minor manual fixes + convert fix for stable haxe
added some of my notes as \todos