some final fixes, messages