colidability, code cleaning, linux collision bug fix