shortened some few strings, updated file with takeoffs