Added Save Methods and minor code cleanup.