Added a nil type to the type system.

Marked a bunch of code pieces for review.
Disabled failing test (temporarely)
Remove unused tokens