201312 week3 (Wednesday)

Mine and Will's changes (merged to my branch). To be merged with St.J. master.