Fixed some image stuff and added todo comments.