Code comments; minor tweaks to P-Stop code