Further improvements

Usability improvement. Updated and improved the  documentation a bit.