manual improvements