Fixed and improved all inputs