GA-logging and a few minor tweaks