- Added comments to clarify things
- Added some TODOs