bug fixes, and organize images in image assets