some docs update and some additional functionality