Quick-fix

A quick fix of some bugs & extended the documantation