some additions, work in progress