minor changes + bem-tools