Adding comments.
Some extra validation.