Small fix and some additions