bugfixes, formating