fix indexing
add more operators