Fixed some crappy stuff and made it normal again