updated command list, added checks