Clean up; had commented out some code while traveling without Internet conn., to prevent resource errors.