fixing some quaks