Some fixes and additional messaging