final fixes before deployment