fix more errors; break template step. Have fun Monday!