Added preposition support
Minor fixes and comments