moved on/off functions to macro definitions
fixed serial reading issue