Fixed a number of bugs and updated input config