Google Analytics Tag and small updates