fixes commander among other things