fixing bugs nate finds