few more fixes, add some comments