small overall changes/fixes