cleaned up parser and fixed var names