cleanup2
unified launcher
canvas code