Added some new sources, cleanups.