Last few set of changes

will document in changelog