moar docs, cleanup