Updates, Cleanups and Working Pygments