added some more operations, small refactorings