wip. improve some comments