new input type, and some ceaning up in preparation for pimc