massive yak shave, plus some edits