Slightly changed the input form and warning text, to be more user-friendly. Closes #31