minor modifications
messages stuff