Content update closes #4 #6 #3 #2 #10