Working on the documentation and CS fixes