Manohar branch

pull the fixed ones