FIXED FEW THINGS, STILL WIP