Minor Fixes

And final submission