Snapshot SR16b8

Just edited some stuff, nothing to get excited about.