Manual Mode: Improve state handling and status checking