more ops and bug fixes