improved comments where possible, added another button test