Documentation updates and start working on some factory improvements