fixing few bugs and adding more details to a proposal