Add wraping image step and bug fixes