Added table formating, and some validation