Minor changes
Better documentation