addressing some bugs prior to writing spec tests