Input Settings updated and a few small updates