fixed canvas, a few cleanups
merge