list usage instead of string parsing + some minor fixes fow message creating