changes as of 2014-01-27

merged changed from Ethan + Alan to date, jan 27th, 2014