Release Fix!

Release Fixes and additional touches for usability