cleanup inconsistencies, tests pass, add more CS love.