Fixed some uses of @Optional notation. Also switched to DrummerMC's terminal handler.