More Content

Partial update for Artemis and a few fixes as well.