tweaked error labels/messages, reordered some status items