Improved docs, builder..