minor updates, main issue of null pointer in AssignmentMarker still
present.