fixed bugs including rapid clicking prevention