cosmetic changes and fix crash :x