few litte bug fixes