Latest updates

This is the final tweaked version that I've been happy with for more
than a few days! :D