Changed a few things to the parser

However a complete overhaul might be needed...