Fifth Commit

I don't even remember half of what I updated anymore... Tons of
updates/fixes/etc... Enjoy.