Some uncompleted code and updates to comments.