commands semi-work, added more block checks