- style fixes
- style fixes
- minor glitches