Added context, other small changes