Changes and Such...

Max-

Here's a pull request.  Let me know if you want subset of the things we have added/changed.

Thanks,

 -Alex