Simplified Niryone placing code in E1S1 and fixed two preprocessor errors in E1S1 and E1S7