results restyle
minor changes to status message
fixed merge conflict