Minor changes, commentation, etc