Fix some minor issues, change some colors, add some TODOs
Refactor some code, fix some bugs