removed bm / minor fixes
fixes