Fixed some visual and parser bugs