More fixes and eye candy