fixed some xml writing and edited finish screen