added some more ops, needs testing.