updated libraries, code cleanup, add bundle icons to watchSources