committing some changes made today