Fixed some ambiguities and parse errors, especially in assignments, tests still need to be repaired