Added content
A few fixes