updated to use unjoin
updated to 2014 version including numerous fixes of old bugs