little fixes and changes