Changes made before ICES 2013

Still a work in progress