Update Key, Minor modification to Makefile