Added more methods and tidied up existing methods.