minor bugs, validation, comments