Random code changes and fixes.
Just one more keyword...