Add more goodies via http://cfenollosa.com/misc/tricks.txt