Cleaned up main, modified main, parser, node to comply with assignment specs.
Merge remote-tracking branch 'origin/nathan'