Changes to support bragme, plus some installation improvements