More simple fixes. Mostly working orders.