added tabular support, beautified a few things
added tabular support