+Return call, minor tweaks