Some fixing, still much to do :/