more unspamify and fix py3 bug
Fixed bad border handling