Updated Reaper and added Sorrowfel, plus some cleanup