- Cmake variable cleanup
- script adjustments