some edits to get examples working