add dox, some fixes..