add probabilities output
fix enums
fix whitespace
fix probability computation, add naive probabilities