Fixed Resolving Errors

... caused by not correctly updating re-resolved accesses
Also fixed some parsing problems.