Cleanup output; fix done bug