citation and lengths improvements