wip
merged
small clean up