Tidied up models, merged in spec changes