major tweak
uncomment GA
tweaks
remove video