misc clean up and fix generic named type spec