little fixes and neatening