Fixed some shiz I should'a fixed before