Various polish and feedback work