Some validation in comments (although I couldn't manage to show the errors)
Some minor improvements