minor fixes, added excludes list