fixed shit
stuff
merged shit