finish changes, ready for RC