little fixes and cleanup