Sanitised numeric inputs, and added Headless support