Proper watching, other changes