Fixed all parser bugs (for now)