- fix some compiler warnings
- mini-cleanup