Initial commit, part IV

Last tweaks