Chnage user inputs to currently supported or currently in development
Small fixes