Changed finished to complete
Minor improvements