- style fixes
- bug fixes