Streamline makefile
Update notebooks