tweaks
merging in latter changes
again
more tweakings to styles