fixed bugs, new key