fixed stuff
merged stuff