Completed pc21, updated Makefile