Implemented some minor changes I suddenly thought of, related to types in its current state.

Added some TODOs throughout the code related to types for later.