Comments & small fixes