add end() in interrupted in scaler methods and make sure constants go in the right...