hopefully fixed up all the parse code