Added missing functions, and initial support for uncaughEvents