Fix camp detection; improvements