Fixes and add infos refactoring.