Image editor commit 1, and lot of small stuff