fixes to scottfree after parser fixes made