minor changes
latest chages merged