Fix scythes

Fix scythes so they work correctly know. If anyone could tell me how to fix the commit noise from the merge I did, it would be greatly appreciated