Fix unicorn joke & various other things