Add unloading message, minor cleanup