style and general wrapper changes