Fixed comments, nothing major