Bug fix + updated Status command