'self up' the code, fix this reference in onError
variable renaming for clarity
add exclude/include to significant terms