updated to new docker
merged and added cjellicks fixes