a few more changes
merged master