Added tables + minor fixes.