fixed ambiguities in variable assignment, fiotr seems to parse but still there is ambiguity in switch cases and assignments have to be checked again. Tests need to be rewritten for the new structure, but most work.