Minor improvements
Adding some preliminary variable handling

Syntax has been under flux