Fix make segfault bug
Simplified Makefile
Update notebooks