- moved hashing of identifiers into the parser so that scope can be considered
- did some style formatting