rework assertion messages

Fixes #4