WIP CW-153 - Cleanup & message fixes