wired up comments and added conditional validation