fixed many issues, still not sure if images are working right