major updates to note and site models