Cleaned up syntax parsing. Fixed multiple join bug.