Fix comments, remove debug, add HC caching