Added more methods and comments.