WIP: one more bug fixed
WIP: cleanup