visual fixes and debugging
more visual fixes and debugging