PC18 & Makefiles Updated