various changes
merged changes