For/Some corrections + optimizations