a fix and some additions