Looks good to me.  Added a few minor tweaks and fixes.