Updates to the image class, to scss, some more bug fixes