minor fixes
toward staging Input