Fixed some input bugs after breaking them again with regex.