general update

update as of 12/1/14