misc changes from Mornes document