Cleaning up some inconsistencies

#include guards, use of 'and', 'or'
Verify expressions: RHS of OP_DOT is ID, LHS of assignment is attribute
Finish nicely
Minor formatting changes
Add debug capability