Added all type signature and variable definition stuff to parser
eliminated newline trick in scanner and parser