Finish tweaks for 2014 first batch, ready for tests