fixes and neatness