fixed primarykeycolumnjoin
some other updates