More cleanup, more annotations...

This seems like an endless job...

But it has to be done...