fixes in progress...