Various cleanup to recent work
Spinning Halberd