standardize p handlers, fix missing class error