Fixed terrible stuff