Cleaning, tweaking and some more progress