Fixed content lookup and minor issues for Rythm