updated Analytics file, corrected errors in other files