More changes...

Nothing organized.