Fix scythes.

Fix scythes so that they work correctly. Also has commits from a merge that I unfortunately can't seem to dismiss or merge.