Further cleaning in assignmentLinker and some bug fixes