added fields to users, cleanup notes forms