add changes and bugfixes