minor fixes / typos / etc...
move parser to contoller project...