final fixes, maybe