added more operators; dedents at eof