polished a lot of stuff