panel doesn't crash + other changes