Changes to the way input and obstructions are handled, minor changes