fixes and details