Bug fix and added Status command