updates and style tweaks