- btype formatter
- small fixes