tiny renaming
support of literal numbers with ids

68 of 100 passing
whitespace cleanup
haml: splitting some files up