Prettier plantings

Mostly Skud's work; I fixed some failing tests. PT story: https://www.pivotaltracker.com/story/show/42827603