! Fix effect holes, minor argument list changes