some litte bug fixes