Minor comment update and performance fixes.