Fix minor bugs
Add: TODO
update google analytics url
Fix issue #56
Fixx issue #55
Attempt att issue #54
can no longer produce issue #54