fixed some things according to drwho-online and added a bit more.