updated several classes