[wip] some corrections and restructuring...