started on tableau, fixed some bugs