Parser - various bugfixes and some methods were made public.