just a bit more style and fixes