doc and cs cleanups