some bug fixes, only image one is still there