Update note handling, and site stats