Completed pc22, updated Makefile