updated libraries, code cleanups, added manifest extension file to watchSources