Corrections from shardy. thx