Ok, a bit cleanup and stuff and move to Yeb