some comments, corrections and fixes