Fixing little things, getting ready for branches