Bug fixes, and other visual fun fixes