new fixes with extra features