added click and keyboard settings (#4) + code cleanup