turned on abstractions, fixed some patterns