Bug fixes and some more style