Clean-up and stuff.

Disabled shader tabbing due to broken functionality.

Tidied up the debug statements.