Working on a verbose engine for testing

Several sources changed for visibility purposes.