final fixes before Town Hall