minor changes
basic joins seem to work. Needs more testing
joining via intermediate table appears to be working, needs testing
alias joins
cleanup before merge