fix all the problems with last check-in and perform initial move to renderer.js