Fixed things and changed things. Terrible commit, sorry