Input improvements (ready for JSON-loading)