Fixes for python2/3 compatibility
Visual tweaks