changes for kdh
home ok
small updates
fixed conflicts