minor changes and signature

see individual commit messages.