fixed "skip" to be "invalid_skip" on function calls
changed function calls to be a generic "callback"