Last tweaks b4 submission