Updates for 2014

Some slight trimming/swapping of code