moar docs
merged