checks and fixes