Fixed Stage InputProcessing, and minor code cleanup