Improvements, random crash not fixed yet