Add Google Analytics, fix a few things