keymaster library added and other updates