fixed a few bleaches
fixed extends context issue