more v2 doku and some minor code changes