debug Command matcher + code improvements