tidied up fixes, on to testing...