Fix: cs improvements (docblocks, some imports, etc.)