Minor Fixes and Google Analytics