all the very small fixes and non-mandadory changes to other files