guide updates and code enhancements