Add onboot and a bit better support for errors.