pulled from robert's branch
Visual tweaks
Merge