fixed small locale problems and new bundle loading support