fixed stuff that broke