changing order and somd small improvements