Fixed and improved input evaluation