and more super dev changes