Some documenation and small changes