Fixed som bugs from refactoring and added google tracking, fixes #4 and #3