changed a few deprecated calls, many remain