fixing bugs from while I was offline