Commands and fixes