Improvements

More to come...
Oops. Good catch. My fault. Debris of various changes I was `stashing` since I started contributing to Gandalf. Let me clean and force push it…