Better syntax and initial image bugfix