some fix refcator new features init blah