fixed bug and enhanced Command, prepared for release