added terrain. drawing only
fixed merges