Some small improvements also adds new join plug-in