#3
removed ndoc, some fixes