fixed stuff
merged