Changes made after extensive moodle 2.4 testing