Fixed an error message
Code cleanup
Also set the current context when updating content