cleanup, added completion indicator