added some extra changes to the parser (further needed implementations are writen in TODO.txt)