#66 Various continued polishing