assignment bugfixes