some additions/fixes