Typos fixed and special command resolver are now possible