More Content

Updates from Wahn and some stuff from me.