updated a lot of things
merged
fixed merge bugs