fixed issues and style tweaks