Fixed table and bugs 1-14