final fixes for review