More tweaks and documentation