Updating docs & working on the generators