Fixed some drawing bugs, altered image format