final fixes for first project pull