fix docu and added message removal