a few final fixes