Fixed input stuff and added new combo