fixed things
merged