TODO:  +-

Removed some completed items, and added some suggestions from Dominik Vogt.