Google Fixes

Updated to add fixes based on Feedback from Google
Further Fixes