add some more info, and fixes