Sorta fixed up stuff