made a few contextio changes