Updates to Bazmo and links