Fix some details, sart to work on image transformation