TODO

This is a list of things still left to fix.