final fixes due basecamp