Several bug fixes prior to 4/15/14 demo