Fooled around with additional fixes.  I feel like this is good to go