some additions and repairs