Fixing various mistakes