Added two articles and some cleanup