Minor corrections and work on lathe mode