WIP - cleaning, tweaking, optimizing...