Some imput issues fixed