latest minor changes
merged with origin