Performance and compatibility improvements; Wording adjustment on errors