fixed some
merged