Added lots of TODO comments in code. Most of them are fairly easy to fix.