Final tidying up for 1.3 + some 1.3.1 bugfixes