final fixes. hopefully