DOC|BUG: Updated documentation. Fixed minor bugs.