#2514/r21637 Fix weekly acceptance (see also r21642)

git-svn-id: https://chaste.cs.ox.ac.uk/svn/chaste/trunk@21692 b5f69653-2bf5-0310-8201-b0dafb8e1405
#2533 hopefully fix ticket, some of comments, and renaming a function

git-svn-id: https://chaste.cs.ox.ac.uk/svn/chaste/trunk@21694 b5f69653-2bf5-0310-8201-b0dafb8e1405