Minor fixes, comments etc.