hopefully fixes some things