slightly change the way we handle comments.
add support for variable declarations in keyword statements
change this to mimic python's implementation as I was getting some NPEs around the bundle occasionally.
fix issue with ${varaible} = vs ${variable}=
0.4 version