Changed some names, cleaned up a bit.

Much more stable logging etc.