Some minor changes so far...

I'll be doing more extensive work where necessary once I have more time in my schedule to do so. ;)