misc changes from calavera