Post-refactoring bugs fixed
Messages output improved