Initial bug fixes 1/20/14