fixed a lot of leon bugs