updated several things