a few small changes
merge