updates from Adam, plus DRC fixes