Fix + addressed comments.