Working on the documentation, some CS fixes