functionality and style tweaks