Adding Alwin & Ross + fixing various mistakes/omissions