Added default image choice, comment removal