more style tweaks, iron out the last bugs (hopefully)