more changes and adds