fixed Notebook, added most of Student