Minor changes. Join/Unjoin and delete still not working.