big bug fix
more bugfixes