Image split and minor fixes