finishing touches
Added system messages