fixes ... fixes and fixes