- eliminated a bunch of warnings
- few more work for gaf 4