more changes, need to fix unicode errors and handling excludes