Updates for Nov 2014

still draft - need to clarify a few things with Shifu