small aditions/fixes