Some cleanup; add categories table