little changes and bugfix