Added Humanizer

And a few tweaks