fixed previous errros in multiple assignments, reworked some files more than others