Validation

Changed variable names to clarify distinction between row/cols and
started map validation.