TAG 1.0.18 some refactors and corrections to console output