UnitUnloadingListener added. Unloading re-arranged. Minor changes in log
messages.