Adjusted to new name
and various small improvements