Cleaned up main, modified main, parser, node to comply with assignment s...

...pecs.