more final updates for 7-10-14 ^_^