Various improvements. Better clicking method