removed mousetrap, added keycharm