Content and minor fixes