Added missing code, formatted tables.