copied to tdd-docker-wjax, additions, fixes