Update and bugfix