fixed a thing or two after merge. Still some bugs though