- small fixes for on and 1