Move vars into properties

Figured Id check in the small fixes to the only two places I could find this issue. @eric79 does this look alright? (Still beating my head against the wall on the blockly issue... starting to move events into satProperty today)