some corrections to last commits