completed changes for revised error model

finished making changes to use the revised error model