fixed stuff that was broken