more bugfixes and improvements (Naomi chat is resetted in this update)