ok
bug fixes
merged