Many small changes to address many small issues.