bugfix and anaytics