Added a brief completion level / message, tidied up some things.