more input bugs fixed