fixed #3
added data tables, closing #6
fixed #2;
fixed #1;