removed unused operators; some minor tweaks