refactoring and better notes and form stuff