styleupdate and bugfix