fixes, in progress