some small changes
merge fix