whole stuff of fixes