Keystone progress
Minor changes to makefile