style tweaks and more
initial