Added a bunch of options & improvements to table, fixes #18 #19