some final fixes;