some additions / fixes