Tafelopstellingen (1 line replaced) + general fixes