added a few fixes/clarifications