Final fixes, added illegal identifier errors