#1 doc + fixes