bug fixes 4 and testing cmd