Some fixes

Some bug fixes and added Google analytics