cleanup
slimmed down image library, more speed optimizations