Fixed Command and added debugging.