fixes and additions for summer 2014