fixed the whole weird stuff