changed several things