Integrated all code from today and bugfixes, 11/14/2014