Fixed clustering bug and set bounds for all maps