Change from callback for INP to return code, other small improvements