Fixed some stuff & added support for no cmd char