Added entries, and tweaked some others

Signed-off-by: Thomas Hodgson <thomas.hodgson@gmail.com>