changed button messages, added some comments