postmaster changes
add softContains and a misc. refactoring.