Fixed regexs on commands vs object names, should all be working now