bugfix in keys_neutral, tidy up Makefile