Fixed a little bug and added some ideas to TODO

It started working surprisingly well
I don't know why