various smaller fixes and clarifications