Minor fixes, improve comments