 - update docs and manpage

 - probably fixing bugs...
