Merge in @galactic-void's *awesome* changes

These are great improvements, @galactic-void.  I hope you don't mind me merging them into the main branch?