fixes

- FIX: nomenclature
- FIX: compiler warnings / errors