Fixed customizer + other fixes