Changed to the new message system for /i. Also fixed eof newline.
Cleaned the /i a bit more.