small fixes and some comments