fix + some comments