Grouping messages
Messages in plural only if more than one file
Change in message when file is invalid
Added error on invalid extra files