several misc changes.