some little fixes and improvements