Cleanup, small graphics improvements