Added header for p1functions; fixed Makefile; added some todos