bugfixes
added TODO comment