lots of clean up in response to Alain's comments