image bugs fixed
merge