committing fixes before branch