spruce up some more inputs