add goals, accounts, fix notes