Misc. Command fixes ... been so long can't remember exactly :(