Removed Analytics, it was junk anyway
Fixing some bugs