Added a small TODO, commented warning on old todo

Other very minor changes. (Added serialID again to get rid of warnings)
UML diagram and API are coming along.