Pull request for 2 days, 15 commits

And the day ain't through yet folks.