Changed /sec loop behaviour + small fixes