Misc Changes to Kaas

Nothing to see here, move along.