Various strategy improvements. More work on lathe.