More comment updates and changes for fast path option