Minor Fixes and new Input Errors