Added entries and some tidying

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