more tidying, updated deploy scripts