Updated content, type tweaks