added minor changes
fixed merging issues