Fixed operations repeating. Small fixes.