Removed headings and patches moved for 'remain-stationary' and 'surrounded' action patterns and modified TODO comments.