minor changes, comments etc