Misc progress on Nagger.