image optimization + small improvements