fixed bugs and updated new keys