Implemented the last 3 comments.