Cleanup
Added possibility to show additional messages for any user
Fixed potential bug