Added more content and tidied up files a bit