some final fixes were made