fixing long lines, building w new type stuff