Cleanup, commenting fixes, coverage fixes.