Minor fixing and commenting, tuning the example