Some comments formatting, and some validation. I really gotta stop committing insignificant and unrelated changesin a single commit.