thorough compilation

5 files changed