fixes and logs from Alyson