Added secondary offset support for modifying on/off time separately.
Fixed issues that I never copied into the branch :(