slight api changes + api docs
merge