fixed two issues in hotfix1
readme for hf2
fixed conflicts