Completed pc23, updated Makefile