lots of clarifications and fixes