various changes
merged