fixed something
merged some stuff