Clearing up comments; almost through sorting