Fixed wait/when, added preprocessed files