Merge pull request #275 from bolte-17/scarecrow

Further scarecrow improvements