update and bugfix