Better x-scale choosing via prop()
Minor purrtification