little fixes and stuff