Latest changes

image sizes fixed + a lot of bug fixes