Assertions added; log table creation improved