Added join validation
Fixed updating, added debug messages