Script changes

CInput finished, couple other updates