a lot of changes from the development brach, not including new features