final fixes...maybe