fixed table formatting, added more validations