Old pass bug that broke noko and a few other things fixed