fixing some parser buggs

fixing some parser bug, that happened when I switched names