Small fixes, clarifications, cleanup