Constant input support and minor changes.