A bit further and some fixes.