including more small changes