Added missing entries; tidied up some broken entries as well.